GtkCssProvider: Add named regions to selector path.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 394c74e6eeac24ecffba98bdccefa0bfb92b511c..1c5ee9e70cb313dab3e5861ad750e6ab001e81b5 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -41,6 +41,7 @@ enum SelectorElementType {
   SELECTOR_TYPE_NAME,
   SELECTOR_NAME,
   SELECTOR_GTYPE,
+  SELECTOR_REGION,
   SELECTOR_GLOB
 };
 
@@ -58,6 +59,12 @@ struct SelectorElement
   {
     GQuark name;
     GType type;
+
+    struct
+    {
+      GQuark name;
+      GtkChildClassFlags flags;
+    } region;
   };
 };
 
@@ -204,6 +211,23 @@ selector_path_prepend_glob (SelectorPath *path)
   path->elements = g_slist_prepend (path->elements, elem);
 }
 
+static void
+selector_path_prepend_region (SelectorPath       *path,
+                              const gchar        *name,
+                              GtkChildClassFlags  flags)
+{
+  SelectorElement *elem;
+
+  elem = g_slice_new (SelectorElement);
+  elem->combinator = COMBINATOR_DESCENDANT;
+  elem->elem_type = SELECTOR_REGION;
+
+  elem->region.name = g_quark_from_string (name);
+  elem->region.flags = flags;
+
+  path->elements = g_slist_prepend (path->elements, elem);
+}
+
 static void
 selector_path_prepend_combinator (SelectorPath   *path,
                                   CombinatorType  combinator)
@@ -739,6 +763,9 @@ parse_selector (GtkCssProvider  *css_provider,
       else if (g_ascii_islower (scanner->value.v_identifier[0]))
         {
           GtkChildClassFlags flags = 0;
+          gchar *region_name;
+
+          region_name = g_strdup (scanner->value.v_identifier);
 
           /* Parse nth-child type pseudo-class */
           if (g_scanner_peek_next_token (scanner) == ':')
@@ -752,6 +779,9 @@ parse_selector (GtkCssProvider  *css_provider,
                   return token;
                 }
             }
+
+          selector_path_prepend_region (path, region_name, flags);
+          g_free (region_name);
         }
       else if (scanner->value.v_identifier[0] == '*')
         selector_path_prepend_glob (path);